From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Thu, 23 May 2013 20:26:50 +0000 (-0400)
Subject: global: Use the new mutter API for focusing the stage window
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~4118
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=634ce34e00d144bbfd2636382186157fc7964e17;p=gnome-shell.git

global: Use the new mutter API for focusing the stage window

This way, we aren't "going behind mutter's back" about what the current
focused window is.

https://bugzilla.gnome.org/show_bug.cgi?id=700735
---

diff --git a/src/shell-global.c b/src/shell-global.c
index 2f960484a..da7732bf9 100644
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -541,14 +541,6 @@ focus_window_changed (MetaDisplay *display,
     shell_global_set_stage_input_mode (global, SHELL_STAGE_INPUT_MODE_NORMAL);
 }
 
-static void
-shell_global_focus_stage (ShellGlobal *global)
-{
-  XSetInputFocus (global->xdisplay, global->stage_xwindow,
-                  RevertToPointerRoot,
-                  shell_global_get_current_time (global));
-}
-
 /**
  * shell_global_set_stage_input_mode:
  * @global: the #ShellGlobal
@@ -588,7 +580,8 @@ shell_global_set_stage_input_mode (ShellGlobal         *global,
     meta_set_stage_input_region (screen, global->input_region);
 
   if (mode == SHELL_STAGE_INPUT_MODE_FOCUSED)
-    shell_global_focus_stage (global);
+    meta_focus_stage_window (global->meta_screen,
+                             shell_global_get_current_time (global));
 
   if (mode != global->input_mode)
     {